From ec3c2bb5fdf16478d457232571dacbdc69f8ee4c Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Thu, 25 Jan 2018 22:38:51 +0000 Subject: [PATCH] fix_build_kfreebsd Gbp-Pq: Name 0007-fix_build_kfreebsd.patch --- lib/ts/ink_memory.cc | 2 +- proxy/Plugin.cc | 2 +- proxy/http/remap/RemapConfig.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc index dbce7615..ed9e3319 100644 --- a/lib/ts/ink_memory.cc +++ b/lib/ts/ink_memory.cc @@ -27,7 +27,7 @@ #include "ts/Diags.h" #include "ts/ink_atomic.h" -#if defined(freebsd) +#if !defined(kfreebsd) && defined(freebsd) #include // for malloc_usable_size #endif diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc index c8b91073..99c63d7a 100644 --- a/proxy/Plugin.cc +++ b/proxy/Plugin.cc @@ -126,7 +126,7 @@ plugin_load(int argc, char *argv[], bool validateOnly) return false; // this line won't get called since Fatal brings down ATS } -#if defined(freebsd) || defined(darwin) +#if (!defined(kfreebsd) && defined(freebsd)) || defined(darwin) optreset = 1; #endif #if defined(__GLIBC__) diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc index 1f43d4a6..5378f3a3 100644 --- a/proxy/http/remap/RemapConfig.cc +++ b/proxy/http/remap/RemapConfig.cc @@ -919,7 +919,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in void *ih = nullptr; TSReturnCode res = TS_SUCCESS; if (pi->fp_tsremap_new_instance) { -#if defined(freebsd) || defined(darwin) +#if (!defined(kfreebsd) && defined(freebsd)) || defined(darwin) optreset = 1; #endif #if defined(__GLIBC__) -- 2.30.2